Comment update
Comment update part II