Added comments from Lucio