Last modifications ready to merge