trying to remove the wait