Changes to Boss Class