More comments changed