Double check if SM is running added. Some redundant output removed from SM