quick changes to backport the engine