Final changes 2