Refactored iADS