Apply kind feedbacks from @spikeolaf for ch4 and ch5