Update for v. 1.2