add Underwater2, add userName to json files.