Merge my changes with brians