update from ekmett/ad