Changed the return of the function