NOW I've fixed database