shop controller and logic added