replaced direct buffer numbers with objects