Added changes by Sofia.
Re-added formatting.