Updated intrinsics