finished editing CM and DM