Added RunningAvg & merged the code from shop.