update after refactoring in RinSim