threaded implementation now handles all waits