Some upgrades ;)