Shake improvements