better run completion handling