I'm sure I needed all of these changes