Adapted to work with Hero