Fixing use
Done with API close #3
CS fixing