Reworking shop to be more responsive