Endcap fit and z tag