Merge Don's and Ron's updates