merging changes from ari's repo.