merging changes from hunger games here