added Marco's changes