FUJI: imported/updated/restored stuff