Wait multitasking changes