updated after RinSim refactoring