Updated code for Maneuver handling.