Scary Changes Fixed...maybe