updates from etcb2b project.