Small changes in preliminary simulation
Update for future repo split