some  changes in get data