Reorganized how the shops are handled