New version and some upgrades