Did more work on addresses