Replaced age with school, updated location information