DEBUG removing the wait