v1.02 Improved averaging