I think we should have both the daily xp lamps and 3 keys from missions and daily xp and 3 keys from daily challenges when they return. Just reduce the xp from returned daily challenges to add up with the daily mission xp lamps to be equal to the removed daily challenges that were replaced with hero pass.