Removed the thread wait, breaks on high threads...deadlock?