replaced more "with" syntax