Improve stats for mask