add better support for runs