Improvements to candidate list