fixed layout
removed buffer