need to move db pass out of here