added support for original or final request.