Sounds sensible, but why AD? And should this really be part of this PR?