Updated clusterfinder