Update following comments