added cm support