added some more defs