Working on Ruben comments.