Fixed buffer adding bug and began preparing method3 for buffer changes