Change find_set_mark to mark and find_set_newer to newer