Adding all my changes.