added defs to work off of