CurrentRailSysComposite improved