Final changes and amends