Updates that lluis asked for.