Added back in averaging window