Fixed and added methods to alarm