More improvement on the fight