Sample override data - cleaned up a bit