Changed address into one field.