changed crap code