changed more crap