further tweaking on the rotating tool