Added new Tap code