split code for hero, changed behavior