changed references to file_locations where needed