Merged the two branches, DB separated