Added 'single run' option