fixed the stuff