AUI-1613

Hey me, here's an update for AUI-1613. Let me know if you have any questions. Thanks!