Improve flexibility.