Modified to use non-default runner