refactored databases & loaded data