Mayor update and imporved functionality on quitting