consolidate methods and update shop classess