Updated to current terms