Final version of finder