Attempt at linking up to David's defs