Adjusted calc with avg