Added read buffer to improve performance