Started adding buffer code
Started adding buffer code