add simulation data and clean code