Final changes 2.0