Use the new return type