New class changes starting in May 2024