small changes regarding to whether scrm is directly called