ICMC workshop -- merge Miguels additions.