updating everything after merging from virtual