Marco's changes