Renamed two functions