Improvement to channel, prevention from closing too early!