moved location_id to link table