Add fight, fix problem after lost commit