Database still fragile...