Non-blocking now works completely