my changes ver 2