Added all my changes :-)