added cap stuff