Brett's Changes

All my changes