fixed up the stuff