Reworking Fighter/Swordman