bug fix + new cml