Added shaking feature