Fixed average and added necessary jaguar