We all felt the need for the return type change as well