updated to match CM version