Final changes. Working v3.0