End Cap

Patched and reworked endcap.