Thunder and Heat coming this year