+ fire hero
some merging