change returned data structure