Adding some changes coming from the GetAverages function.
Trying to merge