re-adding class-switching