Updated how GetState is done