Not sure if this buffery route is worth keeping.