Updated for v4.0.1