Added EjectionFinder