New simulator and clean up