Updated Walrus (minor enhancement)