Updated to final text