Changed my buffer list mapping to just use the standard buffer list