- Avoid saving the last data twice
- Added more info logs