Added shop solution