Add Marc's changes