GH278 - refactored temp modifications