Improve Flexability