Pushing these changes just to make sure I don't lose them.