Updated to CM 0.80