Can you please change this from "with" to "when"?