tweaked defs to meet real spec