Trying to fix teh combats