#26 changed classes