Update to return directly