CC - US - LOC

- Fixed a bug in LOC
- Added CC
- Added US

ToDo: create better performance
ToDo2: more and better testing