Merge to Clean-up

Re-merged what I already had to stop the confusion.