Updated for v1.1