Major revision of the manual