Update aafig for short hand again