merged Marco's files