What about expanding this & create 2 components ?