Merging new Nathan Commits