Another Walrus improvement