Added shake feature