upgrade some functionality
some upgrades