more work on alarm