Merged with my changes