5-2 Add 'waitOn' post subscription