Merge Ari edits