Upgrade to v4 + fix links