use original tiers
Merge pull request #1 from restorando/refactor/use-original-tiers

use original tiers