AUI-1451 - we use this form more frequently