add in average and tweaks