Updated for v4.