more work on origin finder