edited up through data with changes from brian and lyndsay