changed setup for simulation run to set back all parameters
refactoring, method extraction