addressed database issues