Updated templates, and reduced complexity of run()