Fixed State and Added Tags