you dont need the wait on most of those macros as the queue perfectly fine for now