fixed up fucked name thing