Refractoring onshake method
Merge remote-tracking branch 'upstream/master'
More changes to the shake functionality
indenting
next try