SHAKE functionality added