Partially fixed the AdvanceController