CHANGED: DB working now