refactored and renamed simulations