changed some of the naming schemes
added updated db