polished with working db
"Beta" version