D: remove $
U: improve find runner