Added simulation parameters to simulation class
Merged conflicts