Change return types