Slowly getting ready for 2.5 COC