Restructure, use two methods for measuring.