alarm added -- to be reviewed