Swap delay from single messages to command