Rework previous sloppy job on warlord male