Will.traves.78

Please add my changes