merge from Grant's data dic codes

merge from Grant's data dic codes