fixes to the figth2 so now it works