More Work on Resolving Upkeep