AUI-90 Fixing logic
AUI-90 Build files