Improved statistics + calculation