Changes related to the cost of creating a unit (#37)