updated cap and half cap stuff