Updated State Table and some state work