removing needsCandidatePanel and uppercase