Xrf data

Some small modifications.
I see. will go back to check hash mapping or hash table again. Very interesting point.