[Luis, Evgeny] refactor change_data to be faster, and more simple