Arnau's updates.