merge
Finally fixed Friction durps