fixing
manually merged good master code with jordan's code