fixing up crap