changes required due to type generalization in Heros