final update with corrections
.----------------------------.