Pulled in new cList changes