Renamed functions and updated them to stock