simplify event and add alarm type