defs done to bundle tentatively