Better time averaging, more stuff