Easthampton nears final design for New City upgrades