improvements for shop-maintainers