Tweaks to Ari's work.