Revised to use the new runner interface.