fixin more of my stupidity