Switched files for Generic and Nongeneric versions