Modify judgement for pre-DFT