Getting last changes from Robert

Tryiong to pull all latest modification from Robert before doing my changes.