Change from redirect to response