Added friction on/off support