Make DA trigger only when needed