symplifying db creation
merge conflicts