Removed buffering work (now in different branch)