reverted to merge evans changes
reverted to merge evans changes. Manual merge.