modified to a list according to Pedro Algarvio's request