Add Andrea's edits