Problem with CCSRA and CC seem to be fixed

... after having to revert back 8 commits