More Flexability Changes