now with working db