changed classes to use classId instead of className