Fix steps to follow last changes and use alarms to check and run each step