Big change in heros handling