some major update on data-update functionality