Added code from Thunderstruck weekend.