added lots of goodies that may not be goodies