Added back Thunderdome changes