AUI-1410 - consolidate delegates into one. improve handler logic