updated to cm 0.9.9