Improve elasticity