Upgrade of some functions