new version with lots of goodies