Some upgrades on my wish list.