Final change on cool2 feature