Updates for flexability