add support for more automated execution