Demo mode working, simpler average algorithm