fixe some crap code