Update so that the returned URL is based on the request..