Improved cost-model.