code changes to CC & AS