TRAITS MAPPING (UPDATE 2)