Code up-to-date. Added lines modified or added, to meet eNovance needs, as a comment on top of files