Updated to reflect the changes due to Spec Issue 228.