Reviewed engine to better support parallelism