2.1 - Smooth version
2.2 - More Smooth version
Before merge 23