Adding fiona and repairing beams