Improves waiting messages