metrics updates, almost done