Latest changes, and the cr/lf has all gone wrong too ;-(