Cleaned up code and added Alarm2