Corrected class order