Modify tracking_controller