drag and shake added