Added dealing with alert