Globalise the fight data loading and improve it