Fix 2.2
Implement SMC