improved metrics