Changed init to removed buffer