Updates for Sylvia's edits