Added vibration
Merge