Updated with my changes