DisciplineCell modifications
fix