added some more work for tor61