Changed buffer for newlogic