need to improve waits