Add Pablo's example, cleanup