Some changes for bear+ | ScratchStats