Fix alarm, add still stage