updated with my changes