Added lots of goodies