Tweaked rarity system, should be more reliable