Short desc of my changes

Loooooooooooooooooooooooooooooooooong desc of my changes.