Updates to v1.2