Renamed functions and introduced a new helper