Omg changes for issues I'm getting yelled at over