moved location-info data to controller