Changed the return function