change component order. Still good for deployment