Extending the conceptual change approach to mathematics learning and teaching