removed cap stuff