Minor changes + reverted to blockingReceive