added scm switch
added magic_expander