Improved route / Setup state case
Improved route / Setup state case