Merge Sveinn's IAA work