Pulled latest changes from Emmanuel.