Improved rescue, added token rotation