Renamed and added fuctions.