more changes for fall back db stuff