Updated for v1.1.1