Added prelim feature detection