added lots more defs