merged diff betwen brian and my changes