my changes, pass 1