Modified as required for part II