add runner change and exit handler