Dmitriy

Fixing DB saving order