Refit to latest methodology