Critical alerts implemented

Need to refactor