Updated basic simulator