updated to v1.2