added shop support