Merged my changes