Mid refactor
Refactorered server component