updates after refactoring in RinSim