updated code to include the shopType feature