Updated fighting code