Updates part 2, fixed issue with CColor