Keith/Rex - Change terminate to poll for completion