Updated comments & channel events for the previous change