CCS added + bugfix + cleaning