pushing latest changes from CHRR