generally revised for ICNP 2014