Final changes 3