Updated Class (5/22/25)