State saving updated/implemented.