Changes based on feedback by SG, JE and DS.