Cleaned up starting point logic to reduce unneeded buffer updates.