works now
removed debug information
Merge branch 'feature/cp' into develop