Fix bug
Add save process