Some changes, temp for working; db_update UNFINISHED