messages and wait changes