Should work with CCS now