Adding more new/used logic for avg