Added judging paradigms
Fix merges