modifed teaShop again