Improved simulator