Final Test v3.1: Some changes on alarm
Final Test v3.1: Some changes on alarm