Integrate Haptic into Master