reverted back to V's DB...lol :/
fixed merge conflicts
fixed partial merge conflict