Updated for clairvoyance