modify data handling