FIXING STUFF CAUSE I'M BAD