Still dealing with buffer size