Replaced barbarian with soldier and fighter