Pre-judging
merge fix