improved alarm admin