Chococo and Clif updates sorted