Update 7-17

oCMA added + debug