changes to shop models etc