added locations
location option functioning