Boss refactored (#11)