Lot of fix and clear around the fight