updated crap code