some minor changes + potential new class Sim for simulation