* Notes : small correction due to merge