IDs changed to CLASSes