Integrating Creativity and Innovation into teaching