Added shaking and other things