added shop and location