SCC feature works
Fix merge