Added clearance and flash messages