Data saving, draft version
Fix after code review