Improve Flexibility