I forgot when I made these changes, but apparently I made a lot of them