refactor. No more serve.