Rearranced wait conditions