change cost type
Merge branch 'change_cost_type'