SMR v2.0 BETA working branch