Change delegate to call back in end processing