Motor Drive + Thunderwave Fix