finalyzing changes for fallback DB