Added 2 averaging types