refactored hacky new section and fixed incorrect ordering of special preliminary cases