add; test for tr.587