seperate dynamic simulation and static simulation
Merge branch 'simulation'