Added comments from Agustin