Merge Don's and Ron's updates

Merge Don's and Ron's updates