more ctm, some changes