Slightly better Engine factory - *slightly* better