Fixing use + CS