ch5 and 6 changes as per Ray