Basic JW32's changes
JW32's soundtouch changes