added Marc changes