more CCS changes, looking pretty neat