Tweaked sim-setup