updated to CC 1.6 API