Updated for v1 launch