updated wait and message