some more work cleaning up how ADs work