Lots of commented of lines, again