modifications to class Shop