Optimization -- no longer using a running mode operation