Revert and change a couple things