Adding all my changes