Refit to new methodology