Optimized the candidate selection a bit