After staff and others analyzed options, the city proposes a new deal.