refactored buffers into draw, as they will change