implemented alarm methods and update status for the db
fixed conflict