optiFinder improved