That’s a great idea and helps with one of the big things that triggers waiting mode for me. To add to the conversation of techniques, another factor of waiting mode that I experience is the avoidance of task switching (“I don’t want to start doing this only to have to stop doing it suddenly”). For this, perhaps adding an alarm earlier as a heads-up to prepare to switch tasks might be helpful?