Final changes: v. 1.0