Recreated engine with -T command line option