First, remove all hard coded buffer numbers
First, remove all hard coded buffer numbers