Further changes necessitated by adoption of 'Modification' approach