Final fix for now | DB added | JSON file added