Names & comments changed