Make entering with single buffer more streamlined.