Some little changes, as usual...