Changed buffer init