CRP6D improvements