New db. Minor changes in all