Changed the Listeners and created a MovingAverage