Redo for the changes

Going back through and making sure I do it right.