change returned values scheme