More changes to the shake functionality