Some little modifications as usual.