Here are my changes

Please, accept them!