Tweaking to work case independent