moved some from defuns