Renamed two helpers