few defs added