Save state updated and fully working