More commenting after merge