Those changes

Self Quote part 1 Touane 1258387200000