Updated to work with revised engine.