refactor 0.1.7 rows save