tweak datahandler functions