BIG update. merged databases and files