Revert "Revert "attempted to switch off isFinal""

This reverts commit 02ca0380ad8f0f1a661440310d87b7fdc28da2bb.
switch off isFinal