@pdraper would that help with the EAGLE_50 case ? @jregan or @jwillis, could you check that this does not slow down anything in your standard scaling test ?