Added state checker into alarms, very cool marshall