fixed hero and some MQ