more classcard hardcoded changes