Updated data from @yods