Re: RFR: JDK-8285932 Implementation of JEP-430 String Templates (Preview) [v3]

On Sat, 29 Oct 2022 00:56:18 GMT, ExE Boss wrote: >> src/java.base/share/classes/java/lang/template/StringTemplate.java line 323: >> >>> 321: * @throws NullPointerException fragments or values is null or if >>> any of the fragments is null >>> 322: */ >>> 323: public static String

Re: RFR: 8294696 - BufferedInputStream.transferTo should drain buffer when mark set [v5]

On Sat, 29 Oct 2022 12:31:41 GMT, Markus KARG wrote: >> This PR implements JDK-8294696. > > Markus KARG has updated the pull request incrementally with one additional > commit since the last revision: > > No immediate buffer resize; in the rare case of read-past-EOF automatic > buffer grow w

Re: RFR: 8265891: (ch) InputStream returned by Channels.newInputStream should override transferTo [v13]

On Sun, 1 Aug 2021 22:01:33 GMT, Markus KARG wrote: >> This PR-*draft* is **work in progress** and an invitation to discuss a >> possible solution for issue >> [JDK-8265891](https://bugs.openjdk.java.net/browse/JDK-8265891). It is *not >> yet* intended for a final review. >> >> As proposed in

Re: RFR: 8294696 - BufferedInputStream.transferTo should drain buffer when mark set [v5]

On Mon, 31 Oct 2022 08:28:07 GMT, Markus KARG wrote: > **TL;DR:** Your optimization is now contained in this PR and outperforms the > previous code. Nevertheless I plead for Alternative C (double buffering) > instead, which is even faster but much simpler. You had dismissed this previously so

Re: RFR: 8282664: Unroll by hand StringUTF16 and StringLatin1 polynomial hash loops [v2]

> Continuing the work initiated by @luhenry to unroll and then intrinsify > polynomial hash loops. > > I've rewired the library changes to route via a single `@IntrinsicCandidate` > method. To make this work I've harmonized how they are invoked so that > there's less special handling and checks

Re: RFR: 8282664: Unroll by hand StringUTF16 and StringLatin1 polynomial hash loops [v2]

On Mon, 31 Oct 2022 02:34:06 GMT, Quan Anh Mai wrote: >> Claes Redestad has updated the pull request incrementally with one >> additional commit since the last revision: >> >> Reorder loops and some other suggestions from @merykitty > > src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp line 3484:

Re: RFR: 8282664: Unroll by hand StringUTF16 and StringLatin1 polynomial hash loops [v2]

On Mon, 31 Oct 2022 02:21:44 GMT, Quan Anh Mai wrote: >> Claes Redestad has updated the pull request incrementally with one >> additional commit since the last revision: >> >> Reorder loops and some other suggestions from @merykitty > > src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp line 3358:

Re: RFR: 8282664: Unroll by hand StringUTF16 and StringLatin1 polynomial hash loops [v2]

On Mon, 31 Oct 2022 02:15:35 GMT, Quan Anh Mai wrote: >> src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp line 3387: >> >>> 3385: for (int idx = 0; idx < 4; idx++) { >>> 3386: // h = (31 * h) or (h << 5 - h); >>> 3387: movl(tmp, result); >> >> If you are unrolling this, maybe break the d

Re: RFR: 8282664: Unroll by hand StringUTF16 and StringLatin1 polynomial hash loops [v3]

> Continuing the work initiated by @luhenry to unroll and then intrinsify > polynomial hash loops. > > I've rewired the library changes to route via a single `@IntrinsicCandidate` > method. To make this work I've harmonized how they are invoked so that > there's less special handling and checks

Re: RFR: JDK-8285932 Implementation of JEP-430 String Templates (Preview) [v3]

On Fri, 28 Oct 2022 20:23:26 GMT, Rémi Forax wrote: >> Wrong use case. Think `StringProcessor upper = st -> >> st.interpolate().toUpperCase();` > > Is it that different from`TemplateProcessor upper = st -> > st.interpolate().toUpperCase();` ? > > People are really used to use <> with the funct

Re: RFR: JDK-8285932 Implementation of JEP-430 String Templates (Preview) [v3]

On Fri, 28 Oct 2022 20:07:35 GMT, Rémi Forax wrote: >> The defensive copies are done by the callers. > > In that case, i wonder if not not better to move that record inside another > class, closer to where the callers are Moving to TemplateRuntime - PR: https://git.openjdk.org/jdk

Re: RFR: JDK-8285932 Implementation of JEP-430 String Templates (Preview) [v3]

On Fri, 28 Oct 2022 19:05:10 GMT, Rémi Forax wrote: >> Jim Laskey has updated the pull request incrementally with one additional >> commit since the last revision: >> >> Update TemplateRuntime::combine > > src/java.base/share/classes/java/lang/template/StringTemplate.java line 29: > >> 27:

Re: RFR: JDK-8285932 Implementation of JEP-430 String Templates (Preview) [v3]

On Fri, 28 Oct 2022 19:06:43 GMT, Rémi Forax wrote: >> Jim Laskey has updated the pull request incrementally with one additional >> commit since the last revision: >> >> Update TemplateRuntime::combine > > src/java.base/share/classes/java/lang/template/StringTemplate.java line 175: > >> 173:

Re: RFR: 8294696 - BufferedInputStream.transferTo should drain buffer when mark set [v5]

On Mon, 31 Oct 2022 09:52:06 GMT, Alan Bateman wrote: > > **TL;DR:** Your optimization is now contained in this PR and outperforms > > the previous code. Nevertheless I plead for Alternative C (double > > buffering) instead, which is even faster but much simpler. > You had dismissed this previ

Re: RFR: JDK-8285932 Implementation of JEP-430 String Templates (Preview) [v3]

On Fri, 28 Oct 2022 19:08:56 GMT, Rémi Forax wrote: >> Jim Laskey has updated the pull request incrementally with one additional >> commit since the last revision: >> >> Update TemplateRuntime::combine > > src/java.base/share/classes/java/lang/template/StringTemplate.java line 149: > >> 147:

Re: RFR: 8282664: Unroll by hand StringUTF16 and StringLatin1 polynomial hash loops [v3]

On Mon, 31 Oct 2022 02:35:18 GMT, Quan Anh Mai wrote: >> Claes Redestad has updated the pull request incrementally with one >> additional commit since the last revision: >> >> Require UseSSE >= 3 due transitive use of sse3 instructions from ReduceI > > src/hotspot/cpu/x86/c2_MacroAssembler_x8

Re: RFR: 8294696 - BufferedInputStream.transferTo should drain buffer when mark set [v6]

> This PR implements JDK-8294696. Markus KARG has updated the pull request incrementally with one additional commit since the last revision: Alternative C + Arrays.copyOfRange() - Changes: - all: https://git.openjdk.org/jdk/pull/10525/files - new: https://git.openjdk.org/jdk/

Re: RFR: 8294696 - BufferedInputStream.transferTo should drain buffer when mark set [v5]

On Mon, 31 Oct 2022 09:52:06 GMT, Alan Bateman wrote: >> **TL;DR:** Your optimization is now contained in this PR and outperforms the >> previous code. Nevertheless I plead for Alternative C (double buffering) >> instead, which is even faster but much simpler. >> >> **Justification** >> >> I

Re: RFR: 8282664: Unroll by hand StringUTF16 and StringLatin1 polynomial hash loops [v3]

On Mon, 31 Oct 2022 13:18:35 GMT, Ludovic Henry wrote: >> src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp line 3528: >> >>> 3526: vpmulld(vcoef[idx], vcoef[idx], vnext, Assembler::AVX_256bit); >>> 3527: } >>> 3528: jmp(LONG_VECTOR_LOOP_BEGIN); >> >> Calculating backward forces you to do c

Re: RFR: JDK-8285932 Implementation of JEP-430 String Templates (Preview) [v3]

On Fri, 28 Oct 2022 19:12:02 GMT, Rémi Forax wrote: >> Jim Laskey has updated the pull request incrementally with one additional >> commit since the last revision: >> >> Update TemplateRuntime::combine > > src/java.base/share/classes/java/lang/template/StringTemplate.java line 307: > >> 305:

Re: RFR: JDK-8285932 Implementation of JEP-430 String Templates (Preview) [v3]

On Mon, 31 Oct 2022 07:14:45 GMT, Rémi Forax wrote: >> Actually, `StringTemplate::interpolate` is fine, as this method takes two  >> parameters, whereas the instance method only takes an implicit `this`  >> parameter. >> >> The instance method is only assignable to `Function` >> or `Supplier`,

Re: RFR: JDK-8285932 Implementation of JEP-430 String Templates (Preview) [v3]

On Fri, 28 Oct 2022 19:57:41 GMT, Rémi Forax wrote: >> `List.of()` can't be used here, since the elements are nullable, according >> to the documentation. But the the returned list can still be modified, by >> changing the given `elements` array. The input array must be explicitly >> copied: >

Re: RFR: JDK-8285932 Implementation of JEP-430 String Templates (Preview) [v3]

On Fri, 28 Oct 2022 19:20:40 GMT, Rémi Forax wrote: >> Jim Laskey has updated the pull request incrementally with one additional >> commit since the last revision: >> >> Update TemplateRuntime::combine > > src/java.base/share/classes/java/lang/template/TemplateRuntime.java line 45: > >> 43:

Re: RFR: JDK-8285932 Implementation of JEP-430 String Templates (Preview) [v3]

On Fri, 28 Oct 2022 19:26:20 GMT, Rémi Forax wrote: >> Jim Laskey has updated the pull request incrementally with one additional >> commit since the last revision: >> >> Update TemplateRuntime::combine > > src/java.base/share/classes/java/lang/template/TemplateRuntime.java line 79: > >> 77:

Re: RFR: JDK-8285932 Implementation of JEP-430 String Templates (Preview) [v3]

On Fri, 28 Oct 2022 19:33:38 GMT, Rémi Forax wrote: >> Jim Laskey has updated the pull request incrementally with one additional >> commit since the last revision: >> >> Update TemplateRuntime::combine > > src/java.base/share/classes/java/lang/template/TemplateRuntime.java line 289: > >> 287

Re: RFR: JDK-8285932 Implementation of JEP-430 String Templates (Preview) [v3]

On Fri, 28 Oct 2022 19:39:01 GMT, Rémi Forax wrote: >> Jim Laskey has updated the pull request incrementally with one additional >> commit since the last revision: >> >> Update TemplateRuntime::combine > > src/java.base/share/classes/java/lang/template/TemplateRuntime.java line 389: > >> 387

Re: RFR: JDK-8285932 Implementation of JEP-430 String Templates (Preview) [v3]

On Fri, 28 Oct 2022 19:36:07 GMT, Rémi Forax wrote: >> Jim Laskey has updated the pull request incrementally with one additional >> commit since the last revision: >> >> Update TemplateRuntime::combine > > src/java.base/share/classes/java/lang/template/TemplateRuntime.java line 325: > >> 323

Re: RFR: 8294693: Add Collections.shuffle overload that accepts RandomGenerator interface [v3]

On Fri, 28 Oct 2022 23:18:00 GMT, Stuart Marks wrote: > I'm having difficulty imagining how SequencedCollection::replaceAll could > work or be useful. Obviously it's on List already. In Collections.java, it seems that the cases of AbstractSequentialList are handled like so: 1. Call toArray 2.

Re: RFR: JDK-8285932 Implementation of JEP-430 String Templates (Preview) [v3]

On Fri, 28 Oct 2022 19:45:55 GMT, Rémi Forax wrote: >> Jim Laskey has updated the pull request incrementally with one additional >> commit since the last revision: >> >> Update TemplateRuntime::combine > > src/java.base/share/classes/java/util/FormatProcessor.java line 198: > >> 196: *

Re: RFR: JDK-8285932 Implementation of JEP-430 String Templates (Preview) [v4]

On Fri, 28 Oct 2022 23:50:11 GMT, j3graham wrote: >> Jim Laskey has updated the pull request incrementally with one additional >> commit since the last revision: >> >> Remove .orig file > > src/java.base/share/classes/java/util/FormatterBuilder.java line 470: > >> 468: */ >> 469: Me

Re: RFR: JDK-8285932 Implementation of JEP-430 String Templates (Preview) [v5]

> Enhance the Java programming language with string templates, which are > similar to string literals but contain embedded expressions. A string > template is interpreted at run time by replacing each expression with the > result of evaluating that expression, possibly after further validation a

Re: RFR: JDK-8285932 Implementation of JEP-430 String Templates (Preview) [v3]

On Mon, 31 Oct 2022 13:02:18 GMT, Jim Laskey wrote: >> src/java.base/share/classes/java/lang/template/StringTemplate.java line 149: >> >>> 147: * {@return the interpolation of the StringTemplate} >>> 148: */ >>> 149: default String interpolate() { >> >> I wonder if all the default

RFR: 8296140: Drop unused field java.util.Calendar.DATE_MASK

There is no usages for this field. As it has the same value as `DAY_OF_MONTH_MASK` we can drop it. - Commit messages: - [PATCH] Drop unused field java.util.Calendar.DATE_MASK Changes: https://git.openjdk.org/jdk/pull/10888/files Webrev: https://webrevs.openjdk.org/?repo=jdk&pr=108

Re: RFR: 8284842: Update Unicode Data Files to Version 15.0.0

On Mon, 24 Oct 2022 18:50:24 GMT, Naoto Sato wrote: > Updates the JDK to use the latest Unicode 15, which also updates the ICU4J > along with it (8284844: Update ICU4J to Version 72.1). The corresponding CSR > has already been approved. LGTM. Sorry for the delay. - Marked as revi

Re: RFR: JDK-8285932 Implementation of JEP-430 String Templates (Preview) [v6]

> Enhance the Java programming language with string templates, which are > similar to string literals but contain embedded expressions. A string > template is interpreted at run time by replacing each expression with the > result of evaluating that expression, possibly after further validation a

Re: RFR: 8295670: Remove duplication in java/util/Formatter/Basic*.java [v2]

> Issue: Duplication of methods between Basic*.java test classes, due to auto > generation by genBasic.sh > > Fix: Reorganize parts of Basic-X.java.template into base class in Basic.java. > Toggled -nel flag for generation script (genBasic.sh) to remove excessive > white space. Moved a previous

Re: RFR: 8295670: Remove duplication in java/util/Formatter/Basic*.java [v2]

On Fri, 28 Oct 2022 22:43:34 GMT, Naoto Sato wrote: >> Justin Lu has updated the pull request incrementally with one additional >> commit since the last revision: >> >> Remove old ids hack, has no usage > > test/jdk/java/util/Formatter/Basic-X.java.template line 1612: > >> 1610: list

Re: RFR: 8295670: Remove duplication in java/util/Formatter/Basic*.java [v2]

On Sat, 29 Oct 2022 18:05:50 GMT, Сергей Цыпанов wrote: >> Justin Lu has updated the pull request incrementally with one additional >> commit since the last revision: >> >> Remove old ids hack, has no usage > > test/jdk/java/util/Formatter/Basic-X.java.template line 1608: > >> 1606:

Integrated: 8284842: Update Unicode Data Files to Version 15.0.0

On Mon, 24 Oct 2022 18:50:24 GMT, Naoto Sato wrote: > Updates the JDK to use the latest Unicode 15, which also updates the ICU4J > along with it (8284844: Update ICU4J to Version 72.1). The corresponding CSR > has already been approved. This pull request has now been integrated. Changeset: 59

Re: RFR: 8295670: Remove duplication in java/util/Formatter/Basic*.java [v2]

On Mon, 31 Oct 2022 17:50:47 GMT, Justin Lu wrote: >> Issue: Duplication of methods between Basic*.java test classes, due to auto >> generation by genBasic.sh >> >> Fix: Reorganize parts of Basic-X.java.template into base class in >> Basic.java. Toggled -nel flag for generation script (genBasi

Re: RFR: 8295670: Remove duplication in java/util/Formatter/Basic*.java [v2]

On Mon, 31 Oct 2022 17:50:47 GMT, Justin Lu wrote: >> Issue: Duplication of methods between Basic*.java test classes, due to auto >> generation by genBasic.sh >> >> Fix: Reorganize parts of Basic-X.java.template into base class in >> Basic.java. Toggled -nel flag for generation script (genBasi

Re: RFR: JDK-8285932 Implementation of JEP-430 String Templates (Preview) [v7]

> Enhance the Java programming language with string templates, which are > similar to string literals but contain embedded expressions. A string > template is interpreted at run time by replacing each expression with the > result of evaluating that expression, possibly after further validation a

Re: RFR: JDK-8285932 Implementation of JEP-430 String Templates (Preview) [v7]

On Mon, 31 Oct 2022 20:11:34 GMT, Jim Laskey wrote: >> Enhance the Java programming language with string templates, which are >> similar to string literals but contain embedded expressions. A string >> template is interpreted at run time by replacing each expression with the >> result of evalu

Re: RFR: JDK-8285932 Implementation of JEP-430 String Templates (Preview) [v7]

On Mon, 31 Oct 2022 20:11:34 GMT, Jim Laskey wrote: >> Enhance the Java programming language with string templates, which are >> similar to string literals but contain embedded expressions. A string >> template is interpreted at run time by replacing each expression with the >> result of evalu

Re: Jpackage OS/X DMG install Application folder alias name incorrectly shows as path with /

Hi Michael, If I understood correctly you asking for several things: 1) Change “/Applications” to “Applications”. I agree and we should fix it if possible. Did you file a bug for it? If not I can file. 2) Resize DMG window to show additional content which was added via --mac-dmg-content, so us

Re: RFR: JDK-8285932 Implementation of JEP-430 String Templates (Preview) [v7]

On Mon, 31 Oct 2022 20:11:34 GMT, Jim Laskey wrote: >> Enhance the Java programming language with string templates, which are >> similar to string literals but contain embedded expressions. A string >> template is interpreted at run time by replacing each expression with the >> result of evalu

Re: Jpackage OS/X DMG install Application folder alias name incorrectly shows as path with /

> On Oct 31, 2022, at 4:17 PM, Alexander Matveev > wrote: > > Hi Michael, Hello Alexander, > > If I understood correctly you asking for several things: > > 1) Change “/Applications” to “Applications”. I agree and we should fix it if > possible. Did you file a bug for it? If not I can fil

Re: RFR: 8282664: Unroll by hand StringUTF16 and StringLatin1 polynomial hash loops [v4]

> Continuing the work initiated by @luhenry to unroll and then intrinsify > polynomial hash loops. > > I've rewired the library changes to route via a single `@IntrinsicCandidate` > method. To make this work I've harmonized how they are invoked so that > there's less special handling and checks

Re: RFR: 8294241: Deprecate URL public constructors [v2]

On Fri, 28 Oct 2022 14:54:26 GMT, Daniel Fuchs wrote: >> Deprecate URL constructors. Developers are encouraged to use `java.net.URI` >> to parse or construct any URL. >> >> The `java.net.URL` class does not itself encode or decode any URL components >> according to the escaping mechanism defin

Re: RFR: 8282664: Unroll by hand StringUTF16 and StringLatin1 polynomial hash loops [v4]

On Mon, 31 Oct 2022 21:48:37 GMT, Claes Redestad wrote: >> Continuing the work initiated by @luhenry to unroll and then intrinsify >> polynomial hash loops. >> >> I've rewired the library changes to route via a single `@IntrinsicCandidate` >> method. To make this work I've harmonized how they

Re: RFR: 8282664: Unroll by hand StringUTF16 and StringLatin1 polynomial hash loops [v4]

On Mon, 31 Oct 2022 13:35:36 GMT, Quan Anh Mai wrote: >> But doing it forward requires a `reduceLane` on each iteration. It's faster >> to do it backward. > > No you don't need to, the vector loop can be calculated as: > > IntVector accumulation = IntVector.zero(INT_SPECIES); > for (int

Integrated: 8156593: DataOutput.write(byte[],int,int) and its implementations do not specify index out bounds

On Thu, 27 Oct 2022 20:35:26 GMT, Brian Burkhalter wrote: > Add `@throws IndexOutOfBoundsException {@inheritDoc}` to some > `write(byte[],int,int)` and `read(byte[],int,int)` methods of some classes in > the `java.io` package to make things a bit clearer. This pull request has now been integra

Re: RFR: JDK-8266431: Dual-Pivot Quicksort improvements (Radix sort) [v17]

> Sorting: > > - adopt radix sort for sequential and parallel sorts on int/long/float/double > arrays (almost random and length > 6K) > - fix tryMergeRuns() to better handle case when the last run is a single > element > - minor javadoc and comment changes > > Testing: > - add new data inputs i

Re: [External] : Re: Jpackage OS/X DMG install Application folder alias name incorrectly shows as path with /

Hi Michael, On Oct 31, 2022, at 2:40 PM, Michael Hall mailto:mik3h...@gmail.com>> wrote: On Oct 31, 2022, at 4:17 PM, Alexander Matveev mailto:alexander.matv...@oracle.com>> wrote: Hi Michael, Hello Alexander, If I understood correctly you asking for several things: 1) Change “/Applicati

Re: [External] : Re: Jpackage OS/X DMG install Application folder alias name incorrectly shows as path with /

> On Oct 31, 2022, at 5:56 PM, Alexander Matveev > wrote: > > Hi Michael, > >> On Oct 31, 2022, at 2:40 PM, Michael Hall > > wrote: >> >> >> >>> On Oct 31, 2022, at 4:17 PM, Alexander Matveev >>> mailto:alexander.matv...@oracle.com>> wrote: >>> >>> Hi Michael,

Re: [External] : Re: Jpackage OS/X DMG install Application folder alias name incorrectly shows as path with /

Hi Michael. If you mean http://mikehall.pairserver.com/DMG_windows.dmg, then I cannot open this link. It says file not found. Thanks, Alexander On Oct 31, 2022, at 4:21 PM, Michael Hall mailto:mik3h...@gmail.com>> wrote: On Oct 31, 2022, at 5:56 PM, Alexander Matveev mailto:alexander.matv.

Re: RFR: JDK-8285932 Implementation of JEP-430 String Templates (Preview) [v3]

On Fri, 28 Oct 2022 20:04:18 GMT, Rémi Forax wrote: >> But it's an implementation details, BTW i wonder if the limitation is still >> valid, i know that John has changed the implementation of the BSM in that >> area. > > Anyway, i think you are right, this can be public If this is a public int

Re: [External] : Re: Jpackage OS/X DMG install Application folder alias name incorrectly shows as path with /

> On Oct 31, 2022, at 6:57 PM, Alexander Matveev > wrote: > > Hi Michael. > > If you mean http://mikehall.pairserver.com/DMG_windows.dmg > , then I cannot open this > link. It says file not found. > > Thanks, > Alexander > Sorry, wrong dire

Re: RFR: JDK-8285932 Implementation of JEP-430 String Templates (Preview) [v7]

On Mon, 31 Oct 2022 20:11:34 GMT, Jim Laskey wrote: >> Enhance the Java programming language with string templates, which are >> similar to string literals but contain embedded expressions. A string >> template is interpreted at run time by replacing each expression with the >> result of evalu

Re: RFR: 8178355: IdentityHashMap uses identity-based comparison for values everywhere except remove(K,V) and replace(K,V,V) [v6]

On Wed, 5 Oct 2022 03:40:27 GMT, liach wrote: >> Explicitly implement `remove` and `replace` in `IdentityHashMap` to compare >> values by identity. Updated API documentation of these two methods >> ([Preview](https://cr.openjdk.java.net/~liach/8178355/IdentityHashMap.html#remove(java.lang.Objec

Re: RFR: 8282664: Unroll by hand StringUTF16 and StringLatin1 polynomial hash loops [v4]

On Mon, 31 Oct 2022 22:06:20 GMT, Claes Redestad wrote: >> No you don't need to, the vector loop can be calculated as: >> >> IntVector accumulation = IntVector.zero(INT_SPECIES); >> for (int i = 0; i < bound; i += INT_SPECIES.length()) { >> IntVector current = IntVector.load(INT_

Re: RFR: 8282664: Unroll by hand StringUTF16 and StringLatin1 polynomial hash loops [v4]

On Mon, 31 Oct 2022 22:06:20 GMT, Claes Redestad wrote: >> No you don't need to, the vector loop can be calculated as: >> >> IntVector accumulation = IntVector.zero(INT_SPECIES); >> for (int i = 0; i < bound; i += INT_SPECIES.length()) { >> IntVector current = IntVector.load(INT_

Re: RFR: 8294241: Deprecate URL public constructors [v2]

On Mon, 31 Oct 2022 22:00:01 GMT, Phil Race wrote: > You have jumped through some refactoring hoops to be able to apply the > deprecation suppression to as little code as possible .. having made such > changes, then why didn't you just make the recommended change instead ? > > Should I presume