Updated for v1.2.1