Merged Addendum and opt