Marc's changes
Merged Marc's changes