Class/Major logic corrected.