This paper points out the demographic changes in the American society, which is becoming more and more culturally and linguistically diverse. This demographic shift in society calls for radical changes in the educational system, thus not only mainstream, but all students can be appropriately served in schools. The author connects discipline issues often resulting from the mismatch between the curricula and the type of students they are meant to serve. She also provides recommendations and tools that can enhance teachers' instructional curricula in order for them to serve their students more efficiently and effectively. These tools include, but are not limited to teachers' reflection on themselves and their students from the cultural and societal perspective, incorporation of culturally relevant teaching textbooks and materials, and the inclusion of holistic types of assessment towards all the students. The author strongly believes that incorporating these adjustments can substantially lower discipline problems in the classrooms.