Fixed up crap