[Final changes]