Adaapted update_locations for production