Change save, update logics
del
Merge branch 'Kapitoha-master'