make the shop more general