Have taken stock for refactoring of sch-based-peer calculations