Partially upgraded to CC 1.63 I hope