Added engine control, tests inconclusive.