Fixed raw simulator again