Updated to v1.2