Getting ready to work on non-blocking version