Improve the way size indicator is calculated