Some upgrades

"