UPGRADES + ENHANCEMENTS