Moved waitListUpdate() up