Now includes flash notices and updates properly