WIP
Update metrics