Merging Noels Commits by hand