HeroChoice re-implemented and validated