still fixing shit