update after RinSim refactoring