better saved state metrics