Update for part II