Fix finder, add pipeline