Saved state new

As agreed in #152 issue, all changes have been done