removed location_id
added middleware
Merge branch 'dev'