Moved to historical averaging