Updated Class 8