Incorporating diversity into undergraduate courses