ew/bk/sm/chouck: First draft of changes