New version of the makeFight script