Some changes v. 2.0