Merged Nathan's Changes into main.