More TAP Convension updates