Upgrade on Pen Tapping #2