Code adapted to engine changes.