second save of extensive changes to be detailed in next message
save of extensive changes...