Updated to v. 1.4