Improve-flexibility