Final changes2