Addition of new motor, cleanup of old debug