update after refactorings in RinSim