finishing revision up to zero buffer compatibility