This contains my changes