Take into account last PB comment
SG final revision