ADD: a more elegant way