Heimdall to the rescue