add better traces