Some upgrades

Some upgrades