Buffer core better implementation