Modifications to simulator implementation