some small changes, waiting for new DB