Yes. But also make it a point to do a preamble when and where you can. It will give you allowances for sticky spots where you can try fluency improving techniques (i.e., vocal priming and slower and more monotone speaking).