Replaced wait