Changing it so it uses the new Database() func