We shouldn't need this along with the custom middleware?