Update to use "with" statement in both locations