More Tap convension updates