Migrating to Newton Raphson solver in more places.