Added upgrade iterator & functionality for starve time upgrade