noticed bug in adie_id
trying to fix things
merge conflict
everything working