add some changes. Work with data, model