Use struct addr - big cleanup.