Improved simulator speed